From 2d0693f8dde2efcb1504964b0d600037e669491d Mon Sep 17 00:00:00 2001 From: "dan@guaranine.beaverton.ibm.com" Date: Wed, 23 Nov 2005 12:31:30 +0100 Subject: [PATCH] Make 04_memset_smallmem differentiate between console run-away and console daemon death. --- tools/xm-test/lib/XmTestLib/Test.py | 23 +++++++++++++++++++ .../tests/memset/04_memset_smallmem_pos.py | 8 ++++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/tools/xm-test/lib/XmTestLib/Test.py b/tools/xm-test/lib/XmTestLib/Test.py index 728ae12f05..f6bc681cb1 100644 --- a/tools/xm-test/lib/XmTestLib/Test.py +++ b/tools/xm-test/lib/XmTestLib/Test.py @@ -161,6 +161,29 @@ def timeStamp(): print "*** Test %s started at %s %s" % (name, t, time.tzname[time.daylight]) +# +# Try to start a domain and attach a console to it to see if +# the console system is working +# +def isConsoleDead(): + + from XmTestLib import XmTestDomain, DomainError, XmConsole, ConsoleError + + domain = XmTestDomain() + + try: + domain.start() + console = XmConsole(domain.getName()) + except DomainError, e: + return True + except ConsoleError, e: + return True + + domain.destroy() + + return False + + if __name__ == "__main__": timeStamp() diff --git a/tools/xm-test/tests/memset/04_memset_smallmem_pos.py b/tools/xm-test/tests/memset/04_memset_smallmem_pos.py index ebe5c5ba66..11816d14ba 100644 --- a/tools/xm-test/tests/memset/04_memset_smallmem_pos.py +++ b/tools/xm-test/tests/memset/04_memset_smallmem_pos.py @@ -30,7 +30,7 @@ if status != 0: FAIL("xm mem-set %s %i returned invalid %i != 0" % (domain.getName(), domain.minSafeMem(), status)) -console.setLimit(8192) +console.setLimit(65536) try: # See if this hits the byte limit @@ -39,13 +39,15 @@ except ConsoleError, e: if e.reason == RUNAWAY: # Need to stop the domain before we restart the console daemon domain.destroy() - if verbose: + if isConsoleDead(): print "*** Attempting restart of xenconsoled" s, o = traceCommand("killall xenconsoled") s, o = traceCommand("xenconsoled") if s != 0: print "*** Starting xenconsoled failed: %i" % s - FAIL("Bug #380: I crashed the console system") + FAIL("Bug #380: I crashed the console system") + else: + FAIL("Bug #145: Ballooning DomU too low caused run-away") else: FAIL(str(e)) -- 2.30.2